Skip to content

chore: add Breaks and Replaces for dde-daemon#63

Merged
deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
yixinshark:fix-breaks
Apr 24, 2026
Merged

chore: add Breaks and Replaces for dde-daemon#63
deepin-bot[bot] merged 1 commit into
linuxdeepin:masterfrom
yixinshark:fix-breaks

Conversation

@yixinshark

@yixinshark yixinshark commented Apr 24, 2026

Copy link
Copy Markdown
Contributor
  • Moved wallpaper blur functionality to dde-services.

  • Added Breaks and Replaces for dde-daemon (<< 6.1.87) to handle file conflict during upgrade.

  • This ensures smooth transition of files from dde-daemon to dde-services.

  • 将壁纸模糊相关功能迁移至 dde-services。

  • 为 dde-daemon (<< 6.1.87) 添加了 Breaks 和 Replaces,以解决升级过程中的文件冲突。

  • 确保文件从 dde-daemon 到 dde-services 的平滑迁移。

Log: chore: add Breaks and Replaces for dde-daemon
Change-Id: Ia5e10f5d0e72259c310f70a3f0eb2e15f659331e

Summary by Sourcery

Build:

  • Update debian/control to declare appropriate Breaks and Replaces on dde-daemon (<< 6.1.87) for files moved to dde-services.

- Moved wallpaper blur functionality to dde-services.
- Added Breaks and Replaces for dde-daemon (<< 6.1.87) to handle file conflict during upgrade.
- This ensures smooth transition of files from dde-daemon to dde-services.

- 将壁纸模糊相关功能迁移至 dde-services。
- 为 dde-daemon (<< 6.1.87) 添加了 Breaks 和 Replaces,以解决升级过程中的文件冲突。
- 确保文件从 dde-daemon 到 dde-services 的平滑迁移。

Log: chore: add Breaks and Replaces for dde-daemon
Change-Id: Ia5e10f5d0e72259c310f70a3f0eb2e15f659331e
@sourcery-ai

sourcery-ai Bot commented Apr 24, 2026

Copy link
Copy Markdown
Reviewer's guide (collapsed on small PRs)

Reviewer's Guide

Updates the Debian packaging metadata to reflect the migration of wallpaper blur functionality from dde-daemon to dde-services and to add Breaks/Replaces on older dde-daemon versions to avoid file conflicts during upgrades.

File-Level Changes

Change Details Files
Adjust Debian packaging to move wallpaper blur functionality into dde-services and declare upgrade-time conflicts with older dde-daemon versions.
  • Update dde-services package metadata to indicate ownership of wallpaper blur–related files/functionality previously provided by dde-daemon
  • Add Breaks and Replaces relationships against dde-daemon versions earlier than 6.1.87 to ensure dpkg can safely move any overlapping files during upgrades
  • Document the migration in the control metadata so that upgrades from older dde-daemon-based setups proceed without file clashes
debian/control

Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey - I've left some high level feedback:

  • Confirm that the versioned Breaks/Replaces (<< 6.1.87) matches the exact dde-daemon release where the wallpaper blur files were moved, so there is no window where both packages own the same paths.
  • Double-check that all files moved from dde-daemon to dde-services are covered by this Breaks/Replaces pair so there are no remaining dpkg file-overwrite warnings during upgrade.
Prompt for AI Agents
Please address the comments from this code review:

## Overall Comments
- Confirm that the versioned Breaks/Replaces (<< 6.1.87) matches the exact dde-daemon release where the wallpaper blur files were moved, so there is no window where both packages own the same paths.
- Double-check that all files moved from dde-daemon to dde-services are covered by this Breaks/Replaces pair so there are no remaining dpkg file-overwrite warnings during upgrade.

Sourcery is free for open source - if you like our reviews please consider sharing them ✨
Help me be more useful! Please click 👍 or 👎 on each comment and I'll use the feedback to improve your reviews.

@deepin-ci-robot

Copy link
Copy Markdown

deepin pr auto review

这段代码是对 Debian 软件包控制文件 debian/control 的修改,主要涉及包依赖关系的变更。以下是对该 diff 的审查意见,包括语法逻辑、代码质量、性能和安全性方面:

1. 语法逻辑

  • 符合规范:该修改符合 Debian 控制文件的语法规范。BreaksReplaces 字段的格式正确,使用了正确的版本号比较运算符 <<(小于)。
  • 逻辑一致性BreaksReplaces 字段通常需要配合使用,且版本号约束应保持一致。这里两者都指向 dde-daemon (<< 6.1.87),逻辑上是通顺的。这意味着当前包会破坏并替换旧版本(小于 6.1.87)的 dde-daemon

2. 代码质量

  • 版本号精确性:版本号 6.1.87 看起来是一个具体的发布版本。建议确认这个版本号是否准确对应了发生文件冲突或功能迁移的节点。
  • 依赖关系清晰:通过添加 BreaksReplaces,明确表达了该包与 dde-daemon 之间的强冲突和替代关系,有助于包管理器(如 apt)正确处理升级路径,防止系统处于不一致的状态。

3. 代码性能

  • 包管理器性能:添加 BreaksReplaces 字段会增加包管理器在解决依赖关系时的计算复杂度,因为包管理器需要检查这些约束条件。然而,对于这种元数据级别的修改,对最终运行时的性能没有任何影响,且对安装/卸载性能的影响微乎其微,可以忽略不计。

4. 代码安全

  • 系统稳定性:正确使用 Breaks 可以防止用户安装不兼容的软件包组合,从而保护系统稳定性。如果当前包确实包含与旧版 dde-daemon 冲突的文件或功能,那么这个修改是必要且安全的。
  • 潜在风险
    • 替换风险Replaces 字段会导致旧包的文件被新包覆盖。必须确保当前包确实包含了旧包中所有被覆盖文件的功能实现,否则可能导致系统功能缺失。
    • 升级路径:需要确保在从旧版本 dde-daemon 升级时,当前的包能够被正确安装,且升级过程平滑。如果处理不当,可能会导致升级中断或部分服务不可用。

改进建议

  1. 添加 Conflicts(可选):虽然 Breaks 通常已经足够(它阻止了安装,并允许在升级时卸载被破坏的包),但在某些严格的场景下,为了更明确地表示两者不能共存,也可以考虑添加 Conflicts: dde-daemon (<< 6.1.87)。不过通常 Breaks + Replaces 是处理文件移动或功能迁移的标准做法,目前的写法已经足够。
  2. Changelog 文档:确保在 debian/changelog 文件中详细记录了这次变更的原因,特别是为什么需要破坏并替换特定版本的 dde-daemon。这有助于维护者和用户理解变更的背景。
  3. 测试升级场景:建议在测试环境中模拟从 dde-daemon 6.1.86(或更早版本)升级到当前场景的过程,确保没有遗留文件冲突或配置文件丢失的问题。

总结
这段修改在语法和逻辑上是正确的,用于处理包之间的文件冲突和功能替代。只要版本号 6.1.87 确定无误,并且当前包确实接管了旧包的相关职责,这就是一个合理且安全的修改。

@deepin-ci-robot

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: mhduiy, yixinshark

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@mhduiy

mhduiy commented Apr 24, 2026

Copy link
Copy Markdown
Contributor

/forcemerge

@deepin-bot

deepin-bot Bot commented Apr 24, 2026

Copy link
Copy Markdown

This pr force merged! (status: blocked)

@deepin-bot deepin-bot Bot merged commit 5246a7f into linuxdeepin:master Apr 24, 2026
8 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants